projects / nextcloud-desktop.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0fb6dd4 e921e96)
Merge pull request #7789 from nextcloud/bugfix/show-resolve-conflicts-dialog
authorMatthieu Gallien <matthieu.gallien@nextcloud.com>
Fri, 24 Jan 2025 14:06:40 +0000 (15:06 +0100)
committerGitHub <noreply@github.com>
Fri, 24 Jan 2025 14:06:40 +0000 (15:06 +0100)
fix "Resolve conflicts" dialog not showing up


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.